Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Jul 2011 08:58:44 +0000 (01:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Jul 2011 08:58:44 +0000 (01:58 -0700)
commit2d30cab138ff811e172200b787e425be534821b4
treec7519a36ece87421f70f0344544c02e39a1cc5ad
parentaf119239c6f7673b64dc19f75bf19eb9a06b4346
parente83da37734bb509115a9b5c876b1fbab2a8fe598
Merge from trunk.